From: Matthew Barnes <mbarnes@redhat.com>
Date: Fri, 1 May 2015 14:06:24 +0000 (-0400)
Subject: repo: Delete a remote's keyring when deleting a remote
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~719
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=0c92d7a8d05cdb55964a95a6b7703a7d220a39f8;p=ostree.git

repo: Delete a remote's keyring when deleting a remote
---

diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index da671c69..d267ae98 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -915,6 +915,10 @@ impl_repo_remote_delete (OstreeRepo     *self,
         }
     }
 
+  /* Delete the remote's keyring file, if it exists. */
+  if (!ot_ensure_unlinked_at (self->repo_dir_fd, remote->keyring, error))
+    goto out;
+
   ost_repo_remove_remote (self, remote);
 
   ret = TRUE;